]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
calendar: Also update expanded body if necessary
authorFlorian Müllner <fmuellner@gnome.org>
Wed, 11 Mar 2015 00:42:05 +0000 (01:42 +0100)
committerFlorian Müllner <fmuellner@gnome.org>
Wed, 11 Mar 2015 00:47:49 +0000 (01:47 +0100)
As we use two separate body actors for expanded and unexpanded
notifications, updating only one of them on notification updates
is not enough - if the notification has already been expanded,
we need to update the second label as well.

js/ui/calendar.js

index 7345ae0068fa4104841664d25bd7c6958fb59891..67b757db2f08aae1a89dacdafa0fc3ec50e1acbd 100644 (file)
@@ -1045,6 +1045,8 @@ const Message = new Lang.Class({
         this._bodyText = text;
         this.bodyLabel.setMarkup(text ? text.replace(/\n/g, ' ') : '',
                                  this._useBodyMarkup);
+        if (this._expandedLabel)
+            this._expandedLabel.setMarkup(text, this._useBodyMarkup);
     },
 
     setUseBodyMarkup: function(enable) {
@@ -1092,9 +1094,9 @@ const Message = new Lang.Class({
         this._actionBin.visible = (this._actionBin.get_n_children() > 0);
 
         if (this._bodyStack.get_n_children() < 2) {
-            let expandedLabel = new URLHighlighter(this._bodyText,
-                                                   true, this._useBodyMarkup);
-            this.setExpandedBody(expandedLabel.actor);
+            this._expandedLabel = new URLHighlighter(this._bodyText,
+                                                     true, this._useBodyMarkup);
+            this.setExpandedBody(this._expandedLabel.actor);
         }
 
         if (animate) {